Don't dereference info before checking it for NULL. (Coverity)

2006-04-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
	dereference info before checking it for NULL.  (Coverity)

diff --git a/ChangeLog b/ChangeLog
index e5870a0984a14c498d97b83f6e9b6aea1f6d2e1b..25581bc0cf4da25ee131ebb1c369f1be49212f7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
+       dereference info before checking it for NULL.  (Coverity)
+
 2006-04-11  Anders Carlsson  <andersca@mac.imendio.com>
 
         * gdk/quartz/GdkQuartzView.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e5870a0984a14c498d97b83f6e9b6aea1f6d2e1b..25581bc0cf4da25ee131ebb1c369f1be49212f7f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
+       dereference info before checking it for NULL.  (Coverity)
+
 2006-04-11  Anders Carlsson  <andersca@mac.imendio.com>
 
         * gdk/quartz/GdkQuartzView.c:

diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index 397b70035636a9dedcdfe94359a459f97e23e782..9f7b03f5bb8eeaaf57ff1d078b1733cac56f0f8e 100644 (file)
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -454,11 +454,13 @@ gtk_input_dialog_set_mapping_mode (GtkWidget *w,
 {
   GtkInputDialog *inputd = input_dialog_from_widget (w);
   GdkDevice *info = inputd->current_device;
-  GdkInputMode old_mode = info->mode;
+  GdkInputMode old_mode;
   GdkInputMode mode = GPOINTER_TO_INT (data);
 
   if (!info)
     return;
+  
+  old_mode = info->mode;
 
   if (mode != old_mode)
     {